Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: f0717a9ffe am: 2a22bdeec6 am: e585766e12

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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