Merge "Remove auto-DND while in call." into oc-dev am: 064bd03121  -s ours
am: 6b4ba27abb  -s ours

Change-Id: Idab9fbdefcac84e32f37aa5003f55aea586ec363