[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 4fb57dd32a -s ours

am skip reason: Change-Id Ibabd0304187cc4d365ddf08858dd673e05a3806a with SHA-1 669a56027f is in history

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

Change-Id: I96d547974657ae8507acba952d0ef9ea2a3fbb5b