Merge "Remove MediaHost incorrect size wtf" into tm-qpr-dev am: 971d90e7

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



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