resolve merge conflicts from develop

Author: adhiamboperes

.github/actions/set-up-android-bazel-build-environment/action.yml

@@ -55,14 +55,14 @@ runs:
         $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platform-tools"
       shell: bash
 
-    - name: Install SDK 34
+    - name: Install SDK 35
       run: |
-        $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platforms;android-34"
+        $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platforms;android-35"
       shell: bash
 
-    - name: Install build tools 32.0.0
+    - name: Install build tools 34.0.0
       run: |
-        $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "build-tools;32.0.0"
+        $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "build-tools;34.0.0"
       shell: bash
 
     - name: Configure Bazel to use specific sandbox tmpfs

app/BUILD.bazel

@@ -81,7 +81,9 @@ LISTENERS = [
     "src/main/java/org/oppia/android/app/administratorcontrols/RouteToLearnerAnalyticsListener.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/RouteToProfileListListener.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/ShowLogoutDialogListener.kt",
+    "src/main/java/org/oppia/android/app/devoptions/AppRestartListener.kt",
     "src/main/java/org/oppia/android/app/devoptions/ForceCrashButtonClickListener.kt",
+    "src/main/java/org/oppia/android/app/devoptions/ForceDownloadRemoteParametersButtonClickListener.kt",
     "src/main/java/org/oppia/android/app/devoptions/RouteToFeatureFlagsListener.kt",
     "src/main/java/org/oppia/android/app/devoptions/RouteToForceNetworkTypeListener.kt",
     "src/main/java/org/oppia/android/app/devoptions/RouteToMarkChaptersCompletedListener.kt",
@@ -285,6 +287,7 @@ VIEW_MODELS = [
     "src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt",
     "src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt",
     "src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt",
+    "src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionSubmittedItemViewModel.kt",
     "src/main/java/org/oppia/android/app/player/state/itemviewmodel/StateItemViewModel.kt",
     "src/main/java/org/oppia/android/app/player/state/itemviewmodel/StateSolutionViewModel.kt",
     "src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmitButtonViewModel.kt",

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   package="org.oppia.android">
   <uses-sdk android:minSdkVersion="21"
-      android:targetSdkVersion="34" />
+      android:targetSdkVersion="35" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />

app/src/main/AppAndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.ui">
   <uses-sdk android:minSdkVersion="21"
-    android:targetSdkVersion="34" />
+    android:targetSdkVersion="35" />
 </manifest>

app/src/main/DatabindingAdaptersManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.databinding.adapters">
   <uses-sdk android:minSdkVersion="21"
-    android:targetSdkVersion="34" />
+    android:targetSdkVersion="35" />
 </manifest>

app/src/main/DatabindingResourcesManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.databinding">
   <uses-sdk android:minSdkVersion="21"
-    android:targetSdkVersion="34" />
+    android:targetSdkVersion="35" />
 </manifest>

app/src/main/RecyclerviewAdaptersManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.recyclerview.adapters">
   <uses-sdk android:minSdkVersion="21"
-    android:targetSdkVersion="34" />
+    android:targetSdkVersion="35" />
 </manifest>

app/src/main/ViewModelManifest.xml

@@ -3,5 +3,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.vm">
   <uses-sdk android:minSdkVersion="21"
-    android:targetSdkVersion="34" />
+    android:targetSdkVersion="35" />
 </manifest>

app/src/main/ViewModelsManifest.xml

@@ -3,5 +3,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.view.models">
   <uses-sdk android:minSdkVersion="21"
-    android:targetSdkVersion="34" />
+    android:targetSdkVersion="35" />
 </manifest>

app/src/main/ViewsManifest.xml

@@ -3,5 +3,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.views">
   <uses-sdk android:minSdkVersion="21"
-    android:targetSdkVersion="34" />
+    android:targetSdkVersion="35" />
 </manifest>