[automerger skipped] Attach vendor_property_type to properties am: 89803c85fb am: 54aa2a6966 -s ours am: adb8e2519a -s ours am: fa88764f2c -s ours

am skip reason: Change-Id Ibed833cd9e5d786e82985ded6bc62abdf8cd9ded with SHA-1 1922128397 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/1425118

Change-Id: I991e731d4996ec97c7199b2786480b2a4afe184c