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

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

Change-Id: I0d87e294d56c3241b5da3d80106cc5f7fca2b745