[automerger skipped] Merge QQ3A.200605.002 into master am: 4223d690c0 -s ours am: 254c481ace -s ours am: 12bee4fb02 -s ours

am skip reason: Change-Id I9f3b573230c3d7c96cfbb03b657068fafbc603b1 with SHA-1 3db9993a9c is in history

Original change: https://android-review.googlesource.com/c/device/google/muskie/+/1323236

Change-Id: Ia787206af34ceab19078a0205df0b2cb2a62bb8f