Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e am: ebe2e05464 am: 7a22adb443

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I999071b30ea66a17bde8c6b77556c9911790a357
tree: 1be6fd1e21aed5b01d4ba59d7ca1f91f5782243c
  1. core/
  2. services/
  3. tests/
  4. OWNERS