Merge changes Icf10d577,Ia9d3cae7 am: 6083210d17 am: a258be9df5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12512a441b330e062fe8e8d482a367e719c7d45d