[automerger skipped] Merge Android R am: 4855e32475 -s ours

am skip reason: Change-Id I3ee1855cba8f1f2f19dd99307d4d527903f93749 with SHA-1 b5023aad76 is in history

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

Change-Id: Ib75f8847c7616ce73e6db5fc404c204daa236818