Merge changes Ie19ab056,Ie9b71083 am: 6b53652d1a am: a24fb8ea4f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5274d244b9c7a9d85028c7c02cbce9697c934956