Merge "Pleasant sound implemented for in-call notif." into oc-mr1-dev am: 2593d707f7
am: 6e23bfc386

Change-Id: Ie046074ea546764115677c5ca3e0163c2e90641b