Merge changes from topics "ms25-appops", "ms28-service-fix" am: 7b8430e17e am: dde5e7bf33 am: 98feac9487 am: 929ec92b84

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

Change-Id: I1575b5e2e5a98ead3abed9b6d87c580fd4d490bb