Merge \"Fix alertDialogTheme in Theme.AppCompat.Light\" into nyc-support-24.1-dev
am: 6713fe8cc8

Change-Id: I56c6f2169af4237237234cb61d8496ad4ebf67d4