[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 1640f70b7b -s ours

am skip reason: Merged-In Ia64f2d51c46a36bbcb2547d4077d4027d0c65985 with SHA-1 504f8cc5a1 is already in history

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

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