Merge "Cover more PendingIntent whitelist scenarios." into nyc-mr1-dev