[automerger skipped] Modified the way the notifications clip to the boundary...

[automerger skipped] Modified the way the notifications clip to the boundary am: 07045f95 am: 720aff94 -s ours

am skip reason: Merged-In I1ebe777c50b85a500ecce22823d547c6d9c3c6d5 with SHA-1 069b0c27 is already in history

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

Change-Id: I532a5d46d69f5da294035abcab42f142891d4085