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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d362aae484020114ab010cc26949e6fed8952d