[automerger skipped] Merge QQ3A.200605.002 into master am: 233d637b10 -s ours

am skip reason: Change-Id Id2344f20d1882f55f2ab57ae4185f1b0cecd23d1 with SHA-1 de6d41a44c is in history

Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1323305

Change-Id: Ic1c09d6b58f6c40add675b4008308906838aa196