Merge "Fix notifications trimmed when unfolded on keyguard" into tm-dev am:...

Merge "Fix notifications trimmed when unfolded on keyguard" into tm-dev am: e077c526 am: a9d3d4e1

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



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