[automerger skipped] Keystore 2.0: Rename legacy_migrator to importer. am: 4a6ba6e8cd -s ours am: f6db512b89 -s ours

am skip reason: Merged-In I0612d0731083548a196911712f6c0adbbc9a5e9a with SHA-1 0ffb8a80bd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/16909354

Change-Id: If34fc9948e9b90889d0d6dad252d9a6f21c6003d