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

Change-Id: I7b7c4acf9d9717688385bae7eda5cb0c8a66ee5c