Merge changes Idd7d86f9,I73569744 am: 420476e0cd am: 086acc1ba8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idec178eb39c014c9817db666fd3d5b5a39be52ba