Merge changes from topic "expose-pending-intent" into stage-aosp-master

* changes:
  Reduce PendingIntent memory allocation
  Expose PendingIntent.addCancelListener