Merge "Fix squished notifications on the lockscreen." into tm-qpr-dev am: c3b2f569

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



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