Merge "Restore shelf clip logic from R to prevent clipping on collapse." into sc-dev am: fe9b6d5e am: e9efba2d

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

Change-Id: I56dac2f404171de98e6ea16c21b65ae84659cea8