Merge "[automerger skipped] Merge "Add AppOps overload to be able to watch...

Merge "[automerger skipped] Merge "Add AppOps overload to be able to watch foreground changes." into sc-dev am: 001bb2fb am: 9fad56cb am: 3f8ed181 -s ours am: f7f5abfb -s ours am: 35388a2d -s ours am: 1dfa7aec -s ours am: 094f7891 -s ours am: 4170ef35 -s ours" into udc-qpr-dev-plus-aosp am: e03d0d90 -s ours

am skip reason: Merged-In I89af46de557fbfc31d69613367a4e26a5222430a with SHA-1 130ff33d is already in history

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



Change-Id: I57f2d90e12f27353a84b1512fa4979ecb8066f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>