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

Change-Id: Ie02a847ac513f89c1c430af0e3f559cf0bc2039d