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

Change-Id: I0a0a6a654de99aead9a6d09e50ea5dac9e31840a