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

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

Change-Id: I1913ca8b9aa44b2e5237798a44c7dfbd9fa6900a