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

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

Change-Id: Ib2a5252323f702e7d0d9847558e5b4da16703f29
tree: 1cc52c389aed3b3ac5b098f96fed4a918c561bdb
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/