Merge "Merge "Fix AlertDialog ignoring the provided theme" into nyc-dev am: 53fb1392f4 am: 98c8687f3b" into nyc-mr1-dev-plus-aosp