Merge changes Iec22ff63,Iaca8a7cc am: 0cec61c277

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a7da1cab20a38cec3e9610a537c6ba9d7a8308d
tree: 3c52f22297c8a8e8ab18c2d788c97dde77496415
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS