Merge "Add property contexts for vts props" am: 98fe6847bd am: 93d1139bdc

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1361757

Change-Id: I46f056fe3fb74d247e8bfb380bef486ebb5dde01