Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771 am: d55023c6e9 am: 634db1b9de am: 6468f11dcb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52c41154ae3364774e63376fbdd5a9f42727b65f
tree: 38e30bbd98f2192625467d339a8f1d8f2dcd1d3f
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS