Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 0f35b07653 am: 9af180ede6 am: 58f8da548d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I032e3d8f16b164f067dba02bde950b93f4e54b83
tree: 75ddb6d545a1ad12c4ad3e8ecb6737715798d1b5
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS