[automerger skipped] DO NOT MERGE Fix AppOpsServiceTest am: c03b32c406 am: 47cc84875c am: ca946bed5f -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1c0196e20fd8d431dadd01fb538d1cc83a2dffe