Merge changes If51b6676,Ia6863a70,I802d2316 am: ada2a7fb3a am: 5c31d240c8

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

Change-Id: Ibb4cfb5be191efe6e6e821eb17d905fb96b02ebb
tree: 99ffe9e9495944dfdce344a97504a4652dccaae0
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/