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

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

Change-Id: I5fb9c7d894423e333f226ff3eea289baeaccbbd9