Merge "Merge "Update ExoPlayer version" into rvc-dev am: 3f3b6157 am: d80bfdf2 am: 1b137877" into rvc-qpr-dev-plus-aosp