Merge "Bring AlertDialog up to date with N framework" into nyc-support-25.1-dev