Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: 45d586c66c am: 6d2b11cf24

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28ac065b0574c94c8d8b0dfabaf15db0694b4f90