Merge "Allow the dismiss target size to be overridden" into tm-qpr-dev am: db23075a

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



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