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: If1c89d5f45812b4806206137183ccce2038d36ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>