[automerger skipped] Merge "AppOpsService.dump() over-used iterator fix" am:...

[automerger skipped] Merge "AppOpsService.dump() over-used iterator fix" am: f0e17380 am: 914c87d2 -s ours am: 35524c16 -s ours am: cc0fa958 -s ours am: 547ff98b -s ours

am skip reason: Change-Id If098f70b386fdc420d970013e6fe9bcbb640ca4b with SHA-1 b80bf4e7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1309658

Change-Id: I57d84af42f731a36973c798159469b9787ebcdab