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

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

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