Fix getLanguage OSInAppMessageController and NotificationChannelManager

* Fix OSInAppMessageController variantIdForMessage retrieves languageIndentifier from OneSignal languageContext
* Fix NotificationChannelManager CreateChannel retrieves deviceLanguage from OneSignal languageContext

Author: tanaynigam

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationChannelManager.java

@@ -39,6 +39,8 @@
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.NotificationManagerCompat;
 
+import com.onesignal.language.LanguageContext;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -113,7 +115,7 @@ private static String createChannel(Context context, NotificationManager notific
       JSONObject payloadWithText = channelPayload;
       if (channelPayload.has("langs")) {
          JSONObject langList = channelPayload.getJSONObject("langs");
-         String deviceLanguage = OSUtils.getCorrectedLanguage();
+         String deviceLanguage = OneSignal.languageContext.getLanguage();
          if (langList.has(deviceLanguage))
             payloadWithText = langList.optJSONObject(deviceLanguage);
       }

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageController.java

@@ -209,8 +209,8 @@ private void evaluateInAppMessages() {
         }
     }
 
-    private static @Nullable String variantIdForMessage(@NonNull OSInAppMessage message) {
-        String languageIdentifier = OSUtils.getCorrectedLanguage();
+    private @Nullable String variantIdForMessage(@NonNull OSInAppMessage message) {
+        String languageIdentifier = OneSignal.languageContext.getLanguage();
 
         for (String variant : PREFERRED_VARIANT_ORDER) {
             if (!message.variants.containsKey(variant))