[automerger skipped] Merge QQ3A.200605.002 into master am: dc1c9c4bff -s ours am: 6af7d3b1fd -s ours

am skip reason: Change-Id I222df79d38ffc157f39a58bf37b4c7d6ae08ad34 with SHA-1 ff65878137 is in history

Original change: https://android-review.googlesource.com/c/device/google_car/+/1323592

Change-Id: I63dbfe1c992ae1afd6311c342f7a693a2ff64799