[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf1...

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf1 -s ours am: 90a22f36 -s ours am: 774e6307 -s ours am: 93b2650a -s ours am: d5c44367 -s ours

am skip reason: Change-Id Ia91690b4826ce358a08766ebe6e756cb1fec0ba1 with SHA-1 fb9d4fc5 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1323300

Change-Id: I22d9227d511e45e6e51997e1ba8e0cb186b06c6b