Merge "Merge "Moving some methods to PendingIntentController" into qt-dev am: 6210ac615e am: 5213dbf7e0" into qt-r1-dev-plus-aosp
am: a90e00b0a6

Change-Id: I6165b1ecaf90d6316f4363b6ec54a22198d29250