Fix squished notifications on the lockscreen. am: 52ebab8f am: a0a8dc0d

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



Change-Id: Ia036b7b53f5839d9f0f4060c5fff7860e43ce8c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>