fix build issue due merge manifest issue

Change-Id: I28fb39fcfc0176739704ae38a95214f16743937a

Author: alabiaga

app/src/main/AndroidManifest.xml

@@ -14,14 +14,24 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+      Module :samples:storage uses an androidx lib that requires a min sdk of 34.
+      Rather than updating the main app's minSdk, override those libraries minSdk.
+      Removing this would otherwise cause Manifest merger issue.
+      See https://developer.android.com/build/manage-manifests#merge_conflict_heuristics
+    -->
+    <uses-sdk tools:overrideLibrary="com.example.platform.storage, androidx.photopicker.compose"/>
 
     <application
         android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true">
+
         <activity
             android:name=".app.MainActivity"
             android:exported="true"
@@ -33,7 +43,7 @@
             </intent-filter>
         </activity>
 
-        <!--required for TFLite/LiteRT style transfer demo -->
+    <!--required for TFLite/LiteRT style transfer demo -->
         <uses-library
             android:name="libOpenCL.so"
             android:required="false" />

app/src/main/java/com/example/platform/app/ApiSurface.kt

@@ -120,7 +120,9 @@ val PrivacyTransparencyApiSurface = ApiSurface(
 val StorageApiSurface = ApiSurface(
     "storage",
     "Storage",
-    "Android photo library access capabilities.\nPhoto Picker for unified device and cloud photo access, and MediaStore for detailed local media querying",
+    "Android photo library access capabilities.\nPhoto Picker for unified device and "
+            + "cloud photo access, and MediaStore for detailed local media querying.\n\n"
+            + "WARNING: These samples only work on devices with Android 14 or higher."
 )
 
 val UserInterfaceAppWidgetsApiSurface = ApiSurface(