[automerger skipped] Merge "Grant READ_DREAM_STATE & WRITE_DREAM_STATE permissions to shell" am: 6c63065a84 am: 2b35dbe9ac am: b087e5b202 -s ours
am skip reason: Change-Id I61c28e15c4e5c3d0ffee4137ecb86e33f7e8f64d with SHA-1 38e58dea36 is in history

Change-Id: Iebfad53918b7f12e351ff22ce4e22b2a35edf805