Merge "Make DND intent immutable" into rvc-dev am: 0408979945 am: 2c367eb14b am: 1fc475a67f

Change-Id: I5034ca7c991daa8adc384a3422864f10bccc1286