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

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

Change-Id: I579f5805c98d3d6497b016bdbdb5a7ef76fce7f0
tree: 3aa71a4bea7a2837c515f2923c214b8ccaefff0f
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/