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 am: 929ec92b

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

Change-Id: I1575b5e2e5a98ead3abed9b6d87c580fd4d490bb