Merge "[BugFix] Fix the media reco expanded layout when there is less than 6...

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

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

Change-Id: Id368ab8c342e4c2b5820ae9501239a52401ed6ee