Merge "Also catch IllegalArgumentException in TelecomAccountRegistry"
am: e8a523c860

Change-Id: I5cd5ac1b498a79ff9c7e054ef2a2815956d28c8e