Merge changes I4256ca5f,I91528e1a,I48bd594c am: 82c60d022d am: afa74de47d am: 909af3ded7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7201b62010a56962a16a89bb43cbde75cda22e14
tree: 153b0ce63740808eceea0a01b5388244975bea3b
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS