Merge "Attach vendor_property_type to properties" am: 3cd3469fa7

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

Change-Id: Ib89370ebf60cf620050dcd650bf7840436a54e44