Apply androidx.media2.* library/package separation to pump app
am: 862df21538

Change-Id: I879990fe5dc530ef326010b78346e6415a7b31a1