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

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

Change-Id: I3afea9b35e85fb27d7c653e8835700f48f861c97