Merge changes Ie19ab056,Ie9b71083 am: 6b53652d1a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8abf61de4725d60e3d8e7793184a8322e80d0c4f