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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3235dd38e4c4912f986cbb27867ff14fe38e81