Fixes for package name for android app

android/app/build.gradle

@@ -44,8 +44,7 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        manifestPlaceholders = [APP_NAME: System.getenv('APP_ANDROID_NAME'),
-                                APP_PACKAGE: System.getenv('APP_ANDROID_PACKAGE')]
+        manifestPlaceholders = [APP_NAME: System.getenv('APP_ANDROID_NAME')]
 
         externalNativeBuild {
             cmake {

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="${APP_PACKAGE}">
+    package="__APP_PACKAGE__">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>

scripts/android/app_config.sh

@@ -6,3 +6,4 @@ if [ -z "$APP_ANDROID_TYPE" ]; then
 fi
 
 sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./../../pubspec.yaml 
+sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./../../android/app/src/main/AndroidManifest.xml