Merge "Merge "Add AppOps listening to STService" into udc-dev am: 3d360a0e am: 2b0ccc50 am: 1039b0f8" into udc-qpr-dev-plus-aosp am: 1f5d4c41

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



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