Merge "Using performHapticFeedback on LockIconViewController" into udc-qpr-dev am: 416c5d7010 am: 27c56c86e6

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

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