Merge "Merge "Clipping the last notification if it's in the shelf" into...
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
am: 6f62fe1a
Change-Id: Ieb36b921bff27c46f20f55cfd37fd465aee00909