Merge "NotificationManager: Fix notifications in VoIP call" into qt-r1-dev
am: 3d1ed4a582

Change-Id: Id6dd08142bf2d6294cf0037b2e3f954f5dcc4dd1