Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746
tree: 0584aae4947e5b4081e554e8848048677d4e936e
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS