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

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



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