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

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

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



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