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: 829b7e4e

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

Change-Id: Ib1d57dcbd629ba582b48fbce1ef5fb04dc990799