[automerger skipped] Merge "Get fresh InProgress array in AttributedAppOp when...

[automerger skipped] Merge "Get fresh InProgress array in AttributedAppOp when adding/removing" into sc-dev am: e904d48c am: de9f912d -s ours

am skip reason: Merged-In I7e754c067520765c00cc67cc310926e63bd0462d with SHA-1 cbb5760f is already in history

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

Change-Id: I97c59ff9d88185053d81d22521698879ce3a3308