Merge "Unlock icon plays success haptic on device entry" into sc-v2-dev am: eeb998c0

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

Change-Id: I09e5d261ff8f39253835b3392ff4c4284b3ef796