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: Iff71a5a5306a2dce34fecd8f8107b59ee575bc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>