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

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

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

Change-Id: I99f7463da5e880060efa36f36d6c13c93c124ae5