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

Change-Id: Iae3e7fb2ff674046422cc77f10761c8543cd83c5