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

Change-Id: I084f82fb18a6b7575f96fc339d8b48a112bbdd5a