Merge "Fix issue where the dnd mode remains on after a call terminates." into nyc-mr2-dev
am: cf281db9db

Change-Id: I23f317a29207c7aefe02c4e3fa60fa21d0825d4d