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

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



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