Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 750e8ca69e am: b1fbb5ca62 am: 787caa8c08

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

Change-Id: I6d897cdcfb5b0e4809a32312071eb77623754f94
tree: b9c97e29c029c8051eac69ea9a2c58698f207f4c
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING