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

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

Change-Id: I028d1f51c9685bcc7bcaabd0339b930aa46940c6
tree: 1927f9229155b3ffa9d15146587324255227476f
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING