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

Change-Id: I18e3c9cc4c31f898b6ae8e760a65be9a74dce5b9