[automerger skipped] DO NOT MERGE Fix AppOpsServiceTest am: 05024a1523 -s ours
am skip reason: Change-Id Ie816e0c6c81ecf25d37f05187591ca0d1edf0bc2 with SHA-1 c03b32c406 is in history

Change-Id: Ieff7e7e29c8a6dabb7a1dc0ddbd0d88d2f3613fc