Merge "Fix KCM key mapping cloning" into rvc-dev am: 287bfd5afd

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

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