[automerger skipped] Merge "Fix KCM key mapping cloning" into rvc-dev am:...

[automerger skipped] Merge "Fix KCM key mapping cloning" into rvc-dev am: 287bfd5a am: b93914a7 -s ours am: 0a11e8a7 -s ours am: 044b07db -s ours am: 88601d2e -s ours am: 49d694bb -s ours

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

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



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