Merge "Add haptic feedback on the kg lock icon" into sc-dev am: 025380e2 am: 35d2c1ff am: 3111a92f

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

Change-Id: I1727dead2ae9ef926579f49502fa2a93fa724466