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