Merge \"Cover more PendingIntent whitelist scenarios.\" into nyc-mr1-dev
am: 7ad28a9f49

Change-Id: I44317faff3ba4243f6a91e7b27384288bdc94f7c
tree: 0bf78915d68956fb3954d6f042828c828b55ae26
  1. tests/