[automerger skipped] Attach vendor_property_type to properties am: 1922128397 am: cf8883921f am: 2be8172c93 -s ours

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

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

Change-Id: I4f068f43e01eef7f6928622f4702a6baf8bd5b28