Fix squished notifications on the lockscreen. am: 52ebab8f am: 4c931226

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



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