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

Change-Id: Ic162bb0ab3d08a4bb3bc0ee93afe382aff0e84c1