Merge "Device Policy API to choose a private key silently"