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

* commit '59cb2cf15c912280b32292c79c2c0e5bfea49b68':
  Revert fix to issue #6880627: PendingIntent.getService() returns...