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

Change-Id: I27f9f0076c6c08c1019ed03c6951771285926212