Merge "Use the @Nullable annotations for choosePrivateKeyAlias." into pi-dev
am: be654b3576

Change-Id: Ic4c6b7c42debd0d273074944ebcb1b4b288f0812