Merge "Annotate several method parameters in AlertDialog.Builder as @Nullable" am: 3619a79ce1
am: a4c526eb6e

Change-Id: I22a4e84f769198e85c2b88fe10b1d34e571ed3d5