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: adabb768

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



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