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

Change-Id: I9d1e0082911fcad4d729c8eace3b960bf6af0d2d