Merge "Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3" into rvc-d1-dev-plus-aosp am: 99d214b9d3

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774

Change-Id: I081ddb97f22ca36bc574e766aba06c15ae8a9503