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

Change-Id: Ie47b53b21217298f8de0b9bcedf7c52002d90642