Merge changes I54c2258c,I47b2d3ac am: 546ae74ab9

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

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