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

Change-Id: I649436bbc69d5c111b825634c6ce7f1f33f84cce