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