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

Change-Id: I74d1681361a55ce23f64a8f0a0f8c70dbd7853aa