[automerger skipped] Merge "Fix pinched short notification at bottom of...

[automerger skipped] Merge "Fix pinched short notification at bottom of lockscreen." into tm-qpr-dev am: 2f63c77b am: b55e304e -s ours

am skip reason: Merged-In I2da67022a62f0b3adcd00df1c9b372754ee643fc with SHA-1 d37fbdaa is already in history

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



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