Merge changes Ifa2aa335,I09366a7f am: 7fed667205

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6a7c2ce8b46e448b3fa61c2ccc0050423521c52
tree: 110b1589fea94a22da639f75a717e6591eeee216
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS