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

Change-Id: Iff6e59ea2bf2eede2afae996341a045e0d0ae79b