Merge "Add haptic feedback on the kg lock icon" into sc-dev am: 025380e2 am:...

Merge "Add haptic feedback on the kg lock icon" into sc-dev am: 025380e2 am: 28ada555 am: bf186430

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

Change-Id: Ia943d7722ec2f77f7b8b6f11927713bb5e2a11f9