Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
am: 73dcab62b7  -s ours

Change-Id: Id30938ad8395a57b7a39becd3c7834df75b2ba07