Merge changes I54c2258c,I47b2d3ac am: 546ae74ab9 am: 29c1aee4be am: 2e8ddd67a6 am: bf1c9f3473

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

Change-Id: Ic7b262291dca40fc8658459a691750ed467795e5
tree: 37812e5fbd322a96d5c6f2cdd240322fffd29461
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/