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

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

Change-Id: I23379a0588163cfd896e1973267bcdd10800c4f4