Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 750e8ca69e

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

Change-Id: I74e0c3eae3bf22c9a05968e2daf5b59da33f01bb
tree: 963fe0d42f71ba15a2f0c1b58e06bbac29ac3a80
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING