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

Change-Id: Iad4aba4108aa1d60e470388bfadf2bdc78984324