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: 03c85147 am: 36dd4a69 am: 138ac270

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



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