Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev