[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 0920ad99f2 -s ours am: 6d580d83b7 -s ours

am skip reason: Merged-In I494f20227bf8aa75904ede4676eb2d5abf1d296f with SHA-1 ccca7db766 is already in history

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

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