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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic520c715578c8c5dd70040bbdc4c535330b0a453