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: 6f0810ee -s ours am: b1ec1727 -s ours am: 76f52fb6 -s ours am: f63dfe9b -s ours am: cb634595 -s ours" into udc-qpr-dev-plus-aosp am: 68c0f639 -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: Ib0784ce602e68035126fa1c2769e2227fe4dde09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>