[automerger skipped] Merge QQ3A.200605.002 into master am: 462f20ca5d -s ours

am skip reason: Change-Id I05d52262ef02cfe3146cbf685acc1fe448676204 with SHA-1 ab4f1c77c5 is in history

Original change: https://android-review.googlesource.com/c/device/google/wahoo-kernel/+/1323593

Change-Id: Ic7310887ca8cb856de2dee1b3a8317142e404b68