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

Change-Id: I6eef49657f2c8da590b3428738366d9ead115e2f