Merge "Let device owners handle onChoosePrivateKey" into mnc-dev