Merge "Merge "Update kg lock icon logic" into sc-dev am: 91ec11dd am: 6e38687f" into sc-v2-dev-plus-aosp am: 8d5f4b64

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

Change-Id: I85d010081cdfd6fea1d7401644ca4deab0ff4aad