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

Change-Id: Ieb656375a9d771b334025dd6f4c6b2a210ea40b8