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

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



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