[automerger skipped] Merge QQ3A.200605.002 into master am: 4223d690c0 -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: I4ca44c2c1dedac97da93ab0ad66cacc886e7641b