Merge "Handle edge cases for haptic feedback on shade opening." into tm-qpr-dev am: bfafedee

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



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