[automerger skipped] Merge "Modify Telephony Tests to handle ImsException" am:...
[automerger skipped] Merge "Modify Telephony Tests to handle ImsException" am: 839d59ac am: 4312a458
am: 0e2f6f7c -s ours
am skip reason: change_id Id68eec88f2a345651fa06d235ad410d64ada7bd9 with SHA1 3859441c is in history
Change-Id: I42f6ecdb38115de09b6e73ff12f7d9247eda58ea