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