Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: f2babbbd67 am: e18ea6cb80 am: 34792dd0c9

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

Change-Id: I94e5cf19a7b7dac8400cb7acf80b39a864099956
tree: 0ae7539dc91a0faeed83a23e763e274dfee3b03c
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING