Merge "Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev am: c1374208e3" into nyc-mr1-dev