Merge changes Idd7d86f9,I73569744 am: 420476e0cd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a5605574dd5126717f879b2dd367861cc35c215