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

Change-Id: I52c1958ef1a7a4ce741b9a754416a6859a47befa