Merge "Moving some methods to PendingIntentController" into qt-dev am: 6210ac615e
am: f3872025ac

Change-Id: If94b9771afa1d57b2df0b790c1da9ab3a415578d