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