Merge "In-call-notif doesn't use AUDIBILITY_ENFORCED flag" into oc-mr1-dev
am: 1986261870

Change-Id: I79e08d9cbfce62b6e4c668858e1bf366760cd969