[automerger skipped] Merge RQ2A.210305.007 am: c354a5a357 -s ours am: 87eeaab572 -s ours

am skip reason: Change-Id I9642ce5da4eb2da1804049d8027144ed547e8493 with SHA-1 3dec1a6e6a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I867b31cfa8098482c38aa71b4e82f6d2befd5145