Merge "Use FLAG_UPDATE_CURRENT for TC PendingIntents." into pi-dev am: 2085646c7d
am: 402a57bac2

Change-Id: Ia8bb7755472d05b74a9d9efb6b4e6df7b4d52b8a