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

Change-Id: Ie1068e4ea6e6d43081ad30dc45242599b62cc350