Revert "DO NOT MERGE:Import AndroidX Media from build 8361981"

This reverts commit 47973fe2468f39506e17017fc76dec6f545f4097.

Reason for revert: Broke build

Change-Id: I8fe11e98f69f1fec27968a7f06f6795e7a5f1dde
22 files changed