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

Change-Id: I2284bf9977e6156c5a13d0104cde585fbdf7f223