Fix squished notifications on the lockscreen. am: c29777f4 am: a3db62b5...

Fix squished notifications on the lockscreen. am: c29777f4 am: a3db62b5 am: 8d8969e2 am: 2a147597

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



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