[automerger skipped] Merge Android U (ab/10368041) am: 166f497a25 -s ours am: 639c581144 -s ours am: 06ddcb7c1a -s ours

am skip reason: Merged-In I9b1a81a02662ec49f24235f995c1503f60a5b492 with SHA-1 1402f63109 is already in history

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

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