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

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

Change-Id: Iacffcc4dcfe48432712839a1f6f40298c9817a7d