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

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



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