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

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



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