Merge "Grant READ_DREAM_STATE & WRITE_DREAM_STATE permissions to shell" am: 6c63065a84 am: 2b35dbe9ac

Change-Id: I4a91b7915fe948c57dda1112c743d010dcd7e67c