Merge "Restored the appearing behavior of media hosts" into tm-qpr-dev am: 3d013165

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



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