Merge "Merge "Using performHapticFeedback on ControlActionCoordinatorImpl"...

Merge "Merge "Using performHapticFeedback on ControlActionCoordinatorImpl" into udc-qpr-dev am: 5ebc66b0" into udc-qpr-dev-plus-aosp am: eb194da4

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



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