Merge "Add day-night-mode permission to Shell." am: 963c11e32d am: dbf9eed8c1

Change-Id: I5fe4468f78049f9907a92121b7e3661bb9598440