[automerger skipped] Merge "Get fresh InProgress array in AttributedAppOp when adding/removing" into sc-qpr1-dev am: 86adf767 am: 415d01bc -s ours

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

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

Change-Id: I269e597d03bb5199b9c98946d29cec836bda515d