Merge "Restore shelf clip logic from R to prevent clipping on collapse." into sc-dev am: fe9b6d5e0d am: e616b98e26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14958562 Change-Id: If81d300b810ef4b7f3593f39a222a547cf16ca98
This commit is contained in: