Bug: 185451283 Test: atest TelephonyRegistryTest Change-Id: I6bf2285e37366ca517a3ea16194a203371e44964