[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c13f9b3a64c14962854a8426d1938dbf" into sc-dev am: 17e971d5 -s ours

am skip reason: Change-Id Ifb61fe596c1a8fab1bd536ec904285e532629b71 with SHA-1 5d414d10 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I800ad441da2d017ed54edd183fbe54f06f4eed2a