Fix squished notifications on the lockscreen. am: c29777f4 am: b6790b9f am: be2c71a4

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



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