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

Merge changes from topics "ms25-appops", "ms28-service-fix" am: 7b8430e1 am: dde5e7bf am: 98feac94

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

Change-Id: Ie1f9bfb4c6a3b0b2a04afbe50a7c15869b680c6d