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

Change-Id: Ibf32b9805693b1b3fff71edc063b588eec85f5e3