Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 71996469d2 am: 068f44831d

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

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