Merge "Fix pinched short notification at bottom of lockscreen." into tm-qpr-dev am: 2f63c77b

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



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