Merge "Add new error codes in MbmsException" am: 8e7057ccf3
am: 20d98578f2

Change-Id: If10d6d2df336be4e52a5b0c4d1bab6455de0f1ce