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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie296e709b883fc2930b83dffbfb1366dd4a7e7e7
tree: fc9deb618ba67ea1f639faea372827cf8de040e0
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS