[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 1b4e77aa04 -s ours am: 0495743439 -s ours

am skip reason: Change-Id I4a73fed034608c137d05d97a09cf3fd78b621ea9 with SHA-1 239ab93c91 is in history

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

Change-Id: Ie67d0915799f5b2f26464d2ad976d0e263289939