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

Change-Id: I66d711c0581f7f2bf9a8edab4f3c352b80a88265