Merge changes Iabad7300,I85363e28 am: e3e711d775 am: 257651846b am: 5362c1b0b7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05f6ae928a5bfa8b56837fa5c55803b2233d36a1
tree: d2e40fb852d51ac4a9c4bf0478e059a8b5ff4b62
  1. framework/
  2. service/
  3. OWNERS