Merge "Route ECDH key import requests to Soft-KeyMint."