Merge "[BugFix] Fix the media reco expanded layout when there is less than 6 items." into sc-dev am: 8ea28f9c am: 46a71aa0 am: 3ed4928c

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

Change-Id: I9c381f48708e67edfb325206c9def85c9b7f8bf8