Merge "Fix style name DialogAlertDayNight" am: 0e5e58bdf5

Change-Id: I239904a6a6a39512835aeee0602a351e864adc54