[automerger skipped] Reorganize exoplayer target names am: d56acd1a -s ours...

[automerger skipped] Reorganize exoplayer target names am: d56acd1a -s ours am: 96e21df7 -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: I700db58904c486f291a7040c4e42ed36467521a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>