[automerger skipped] Merge "Unlock icon plays success haptic on device entry"...

[automerger skipped] Merge "Unlock icon plays success haptic on device entry" into sc-v2-dev am: eeb998c0 am: 6f922ba0 -s ours

am skip reason: Merged-In I9d01e4afe8dd7df8d8d18a9b253c1077b7ce027e with SHA-1 2bfb764a is already in history

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

Change-Id: I5de201d24e3869458b32fcaafbfb026ddd3edfd6