Merge changes from topics "ms25-appops", "ms28-service-fix" am: 7b8430e17e

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

Change-Id: Ia64bf2b5d678aca5aaad1dd90d1e41b04cbc34d0