Merge "Fix alarm text in QSHeader to use PendingIntent" into qt-dev
am: c61a25102c

Change-Id: If9ba6fc7bc8b9e359b667fc7529dee22f51aee09