DO NOT MERGE Fix AppOpsServiceTest
am: c03b32c406

Change-Id: Icb334aaa1f7a6ad6815fb034bbac27f3ace09cdb