[automerger skipped] Merge Android 12 am: 289961d5da -s ours am: 0cdd6bd67b -s ours

am skip reason: Merged-In I93bf9e6af8b5974f314a4da28410f98bccfced2d with SHA-1 cb6726460e is already in history

Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1847336

Change-Id: Ibe7d63e2f280271e621d4702728f68d8ae422611