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

Change-Id: I72cddf720ef8f3efd58ebbe79a2aa3e66a85c95a