Merge "Solve the naming problem for vendor property" into rvc-dev am: 76c0bf871f

Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch-sepolicy/+/11881951

Change-Id: I842f47ad69dc515afe3d9a25c80bdf6c4ae0e0c1