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

Change-Id: Ice575bcbfa87128618901cd36931a54bfd7c9dfb