Merge "Fix alertDialogTheme in Theme.AppCompat.Light" into nyc-support-24.1-dev