Merge changes I16418791,I210f5ddc am: a079336270

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

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