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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f769e2f26a335e767a049916499d86c6c3cff5c