Merge changes I0e6df469,I3d46d5f7 am: 05baf850c4 am: 263ead791b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I307dce7840699d1145be3a57c1f03623bd521c04