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

Change-Id: I543f3a26224e826708dc3317b2f9c2bd7b19b53e