Avoid deadlocks in contact manager.

SignalMessaging/contacts/OWSContactsManager.m

@@ -749,7 +749,7 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan
     return [self cachedContactNameForRecipientId:recipientId transaction:transaction];
 }
 
-- (NSString *_Nonnull)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
+- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
 {
     OWSAssertDebug(recipientId.length > 0);
 
@@ -767,8 +767,8 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan
     return displayName;
 }
 
-- (NSString *_Nonnull)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
+- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
-                                        transaction:(YapDatabaseReadTransaction *)transaction
+                                transaction:(YapDatabaseReadTransaction *)transaction
 {
     OWSAssertDebug(recipientId.length > 0);
     OWSAssertDebug(transaction);
@@ -973,7 +973,7 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan
     if (profileName.length > 0) {
         NSString *numberAndProfileNameFormat = NSLocalizedString(@"PROFILE_NAME_AND_PHONE_NUMBER_LABEL_FORMAT",
             @"Label text combining the phone number and profile name separated by a simple demarcation character. "
-            @"Phone number should be masost prominent. '%1$@' is replaced with {{phone number}} and '%2$@' is replaced "
+            @"Phone number should be most prominent. '%1$@' is replaced with {{phone number}} and '%2$@' is replaced "
             @"with {{profile name}}");
 
         NSString *numberAndProfileName =

SignalServiceKit/src/Protocols/ContactsManagerProtocol.h

@@ -14,8 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol ContactsManagerProtocol <NSObject>
 
 - (NSString *)displayNameForPhoneIdentifier:(nullable NSString *)recipientId;
-- (NSString *_Nonnull)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
+- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
-                                        transaction:(YapDatabaseReadTransaction *)transaction;
+                                transaction:(YapDatabaseReadTransaction *)transaction;
 - (NSArray<SignalAccount *> *)signalAccounts;
 
 - (BOOL)isSystemContact:(NSString *)recipientId;

SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m

@@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation OWSFakeContactsManager
 
-- (NSString *_Nonnull)displayNameForPhoneIdentifier:(NSString *_Nullable)phoneNumber
+- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)phoneNumber
 {
     return @"Fake name";
 }