Merge "Merge "Deflake test in AppOpsControllerTest" into rvc-dev am: 5c82912ab7 am: 8dbbb793db am: 9cf07c95a1" into rvc-qpr-dev-plus-aosp