[automerger skipped] Merge "Add AppOps overload to be able to watch foreground changes." into tm-dev am: 748247412c am: 65aa9b335d -s ours am: 907974e54b -s ours

am skip reason: Merged-In I89af46de557fbfc31d69613367a4e26a5222430a with SHA-1 949cb3d098 is already in history

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

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