[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-a914d38dbf2a4fd283cd25bda2526870" into mainline-prod am: 1467d174 -s ours am: eddb5980 -s ours

am skip reason: Change-Id I2dcf7f0f24948422e0ffd4880846313a75d467d2 with SHA-1 622dc78b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28869c5deb60f017643b77e5a975f1815e9b07f2