Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 3e0c976af8 am: 9fcdfe35c5 am: d1912febe9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I032e3d8f16b164f067dba02bde950b93f4e54b83
tree: 1fefa664a9ee05c278d3895278b5adbf75b8d751
  1. core/
  2. services/