Merge "Removed logic that sized the view before the shelf" into sc-dev am:...

Merge "Removed logic that sized the view before the shelf" into sc-dev am: 6b5d8347 am: d960b950

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

Change-Id: Icee1fbf21844019f0a548941bf7f951d4de326e3