[automerger skipped] Merge "Get fresh InProgress array in AttributedAppOp when adding/removing" into sc-v2-dev am: abd991df am: e18996c5 -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/+/16380117

Change-Id: I1842103705599b08707ed0dd816f045c6c82af45