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

Change-Id: Idee4b22e3dcea3a5c413f6b3f369deb63a2e0ff7