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

Change-Id: Ica0c176aff1c2c580ca2f89dff6889086f261f7b