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

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

Change-Id: I6d897cdcfb5b0e4809a32312071eb77623754f94
tree: 583cf0b9d6e986cecdb826b10b4e2d759c44da55
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING