[automerger skipped] Apply androidx.media2.* library/package separation to pump app am: 862df21538 am: 4e72d86717
am: ff85df5beb -s ours
am skip reason: change_id Id6dbfedb0ca3b39e992c53ad5a0903c8c082a8bf with SHA1 ec423bc6b3 is in history

Change-Id: I4498bb79617ea0b38659f0fc4358497021317c5b