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

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

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



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