Merge "Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca am: 8b1a5af4" into oc-mr1-dev-plus-aosp