[automerger skipped] Merge "Use the @Nullable annotations for choosePrivateKeyAlias." into pi-dev am: be654b3576
am: 9e492100f4  -s ours

Change-Id: I69e57f339e5d6b061d6907c346d5cf411758df68