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

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

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



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