Merge changes I16418791,I210f5ddc am: a079336270 am: 6310f20de1 am: 84230bed95

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

Change-Id: I69cac757b38d9481e2f0036bb3f75ac130131e05
tree: 1201ee1113b8114236094c10d178d4545ff03834
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/