Merge changes Ic2357dcf,Iddf8c71a am: 514e8ad39c am: e7b2119b97

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

Change-Id: Icf3acbfb071fc2d24f0d31c719446604567e2281
tree: 447d8ff2cc21e92cc88326b67408e9d6270fa657
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING