Merge changes Ie0a7ec38,I5199dc85 am: da70abc9e1 am: 4d657988ef

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14e901f0656ba0981c4a3b57f801ad59d3420dd0