resolved merge conflicts due to AES-GCM merge around the same time
resolved merge conflicts due to AES-GCM merge around the same time

AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc