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

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

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



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