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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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