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

Change-Id: I135fbace8fbed83532540955c4992f1be230e38d