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

Change-Id: Ibe5b63413e9068ec5de11b78343373d07af77dfa