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

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

Change-Id: I9acea192d0b5e701d0d40a3074882847637b1df0