Merge "Deflake test in AppOpsControllerTest" into rvc-dev am: 5c82912ab7 am: 8553a1fb74 am: b6f77b6779 am: 4d30f82269

Change-Id: I56359c9af7acdae61dae1f4f0bc36920e06f7280