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

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



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