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 am: ad30113d am: 0b017a3d

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



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