Merge changes Iad296830,I826711bb,Ieb2a9b20,I6b688b00 am: 03c0059bb1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77f958e638b209a3b7f6544e02413420983c121b