Merge "Fix vts_treble_sys_prop_test failure am: 5fc0a99eb5 am: f914dae4f9 am: 471b93ae74" into rvc-qpr-dev-plus-aosp am: b7fec1c400

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

Change-Id: Ibcf4bc03a5fe1d480322adf803e9bbf9f9ae7e6c