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

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

Change-Id: I20b1ce8c3b7a5aebcfd0327703a62a38cb78c74f
tree: 7875fcd15ae22dbd9abff2d1565636ccf05e810d
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/