Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 1e70c22af9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0428b441b34d48157a28dfc0463976be135146f4
tree: a383f4066c7d132cf8a5fc3192ac05e08afe117b
  1. core/
  2. services/