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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7700b4ed9dd9105beb947944d63138330d8c565e