Merge "Attach vendor_property_type to properties" am: 3cd3469fa7 am: 1527304c9a am: d24c6f8e2a

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1424228

Change-Id: I747836f01fa3b534c964d6377bbf0c0c961da9d4