Merge "Ensure MMIDialogActivity can respond to IMS MMI codes."
am: 0f6846dba8

Change-Id: Ie8366358272c479e1ce776489269dcea7cab6a0f