[automerger skipped] Merge QQ3A.200805.001 am: 07183ae1a3 am: b04f7fad1f -s ours

am skip reason: Change-Id I9592448b0f053978dd92f7f58cdd71b8089a6cf2 with SHA-1 c06074b67c is in history

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

Change-Id: I853cc4efd23e21cf751ecd5c5da78f76fc007758