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 am: af662425 am: 6ef0c7c4

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

Change-Id: Ic00c211a5fa8fadd88275478e78ec44005d2cb04