Merge "Enable notifications during an ongoing call" into oc-dev
am: b94abe5e30

Change-Id: I9d65601fff941d5a3764cde34f9c658ea1d2a435