Merge "Update lock icon falsing to use long tap falsing" into udc-dev am: 1e380aea am: 5d0493de

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



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