Merge changes I4256ca5f,I91528e1a,I48bd594c am: 82c60d022d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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