Merge "Also catch IllegalArgumentException in TelecomAccountRegistry" am: e8a523c860
am: b6ee8ea4c2

Change-Id: Ib2b68a6dcd4c8379fffe42680180ac1f2eb665f3