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

Change-Id: Ic444f3351cb130d24a2794284c6bf8709c80712c