Merge "Fix style name DialogAlertDayNight" am: 0e5e58bdf5 am: 4b946112d7

Change-Id: I06d8d48899978302179c8b4c540549d2d4e5deee