Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 4c69988898 am: f07220e8f5 am: 7a7e2bb6a1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79c5b8919396827d281fcd04dced649847e9a038
tree: de24a4a34e7be60352999f9abaa1ce302c6c6b6b
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS