Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev
am: 29c70437b3

Change-Id: I5078d76e3eb861850ef7af769badf81dbdee418a