[automerger skipped] Merge "Fix KCM key mapping cloning" into rvc-dev am: 287bfd5afd am: b93914a7e7 -s ours am: 0a11e8a7c4 -s ours am: 044b07db4d -s ours am: 88601d2e85 -s ours am: 49d694bbc4 -s ours am: eef58f6f25 -s ours

am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

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

Change-Id: I66b735bfb0526bc26d097d5f31c0d2d66e720ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>