Merge "Merge "Merge "Track non-foreground service notifs for appOps" into...

Merge "Merge "Merge "Track non-foreground service notifs for appOps" into rvc-dev am: dfa3298a am: 64fcb9ad" into rvc-d1-dev-plus-aosp am: 6973754b" into rvc-qpr-dev-plus-aosp am: a8f484a4

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

Change-Id: I1ee5f7ab233d40cf1c7ecfd0c7cbdd064ab77171