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

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



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