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

Change-Id: I8c289994b45df626816466c2fed98f9cc7382170