Merge changes Ieb7f33bc,I81b56862 am: df7233f8e1 am: 92860eb233

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb68b5e1c2a3d653af675bae227bf8a5e3a4d72e
tree: 39ff9197c9f49be037948a3ac93c7fc6ee711e81
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS