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

Change-Id: I3ad59a2d5c24f9fe331140b5fc09fb4fc5013b5f