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