Merge "Ensure MMIDialogActivity can respond to IMS MMI codes." am: 0f6846dba8 am: e9bd303f93 am: d5ea70d381
am: 94163d3203

Change-Id: I5fb6e967c134fb2d2bf87a1ab1e223a19f7bff1f