Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe

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

Change-Id: I9c5f96893488f1e103cba740a0bbfb474ffe90b9
tree: 6bdda5e87513fe2ad8e1f906747ab487bf9051d1
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING