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

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

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