[automerger skipped] Merge "Reorganize exoplayer target names" into...

[automerger skipped] Merge "Reorganize exoplayer target names" into sc-mainline-prod am: cf608908 -s ours am: 491e17f1 -s ours

am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965



Change-Id: I476072a90d65e81b46a4b98ba3c9099d5c306b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>