Merge "Don't cancel vibrations in LockIconViewController" into tm-dev am: 696b9393 am: ad136658 am: 19fee2e7 am: afe46714

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



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