Merge "Fix weird shelf truncation when only media can show." into tm-qpr-dev am: 0db8b1de

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



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