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

Change-Id: If4951d2ba45d0dbbc703ec72e471a92a7bcdf134