Merge "Fix CTS MmsTest PendingIntents" into sc-dev