Merge "Remove unnecessary work around for updatable-media" into tm-dev am: 5ec5a80c am: 30b6d6f4 am: dc95980a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029152



Change-Id: I0536ece8f933acd6f9015935a641808c3e8be25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>