Merge "Merge "add AppOpsTest to related frameworks TEST_MAPPINGS" into rvc-dev am: 962b13c5 am: 7e6195fc" into rvc-d1-dev-plus-aosp