[automerger skipped] Merge QQ3A.200605.002 into master am: 5142bd21c1 -s ours

am skip reason: Change-Id Id26c2683062d89569dc7d62c8acb9fe84d257610 with SHA-1 80383ff5d6 is in history

Original change: https://android-review.googlesource.com/c/device/google/atv/+/1323297

Change-Id: I357bdc03119762bfeb89beb5c1d831640f9449ec