Merge changes Ie8d98359,I4d5cadfd am: 69508ee6db am: a2ca3e18cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbc9b89121bcb09fde41deb3f71322005b1ea2ed