[automerger skipped] Merge UQ1A.231205.015 am: b4d0e7c821 -s ours

am skip reason: Merged-In Ib3ccc703aba169eba719121c42cbc248d7d5d477 with SHA-1 126e54a429 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25590391

Change-Id: Ic93190554a543045fe9c00ac7a78fd1b2e90b6c7
Signed-off-by: Automerger Merge Worker <[email protected]>