Merge changes Ifc8ad902,I6d1b8d0e am: 8d659bb1ec am: bdaf1de829

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7bedd741266a08bf2eef515f1fb72a9aebc74e3