[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-289267195037481da3696382edaa3c15" into sc-dev am: cd4ec6ac -s ours

am skip reason: Change-Id Ic44d662936d1ff0cae7fbe915932b37aa4e4869a with SHA-1 051ef786 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09f4680a213bd2e7124ea8ed6c73c92d4150e6e2