Merge changes from topics "ms25-appops", "ms28-service-fix" am: bbb36e91ee am: 113ca82dd5

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

Change-Id: I788b74dbe1928d6d8841efae981fe8181f94d0c7
tree: 23e223e03be46158331f9b8bd5c5f4b2b39eec63
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/