Merge "Grant READ_DREAM_STATE & WRITE_DREAM_STATE permissions to shell"