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

Change-Id: I56c59af5ce9acd1595568d7476888817878cf12a