[automerger skipped] DO NOT MERGE Fix AppOpsServiceTest am: 05024a1523 -s ours am: 3a8e32d878 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a452a14bec588a52ba7983be2fd897a23a21b53