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

Change-Id: I0c56ab68209cf66b9b1de2344293eb7bd588a62d