Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: I3d2d80ed53c5726a35a7d1ca43cafe9c45c127f4
Change-Id: I5f79c277a76c4994914c6e7611338dded991644f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d31bd7e..73d99bd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,6 +31,7 @@
             android:theme="@style/SystemUpdaterTheme">
         <activity
             android:name="com.android.car.systemupdater.SystemUpdaterActivity"
+            android:exported="true"
             android:label="@string/title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/com/android/car/systemupdater/UpdateLayoutFragment.java b/src/com/android/car/systemupdater/UpdateLayoutFragment.java
index ff56371..0ba5b90 100644
--- a/src/com/android/car/systemupdater/UpdateLayoutFragment.java
+++ b/src/com/android/car/systemupdater/UpdateLayoutFragment.java
@@ -279,7 +279,7 @@
                         context,
                         /* requestCode= */ 0,
                         intent,
-                        PendingIntent.FLAG_UPDATE_CURRENT);
+                        PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
 
         return new Notification.Builder(context, NOTIFICATION_CHANNEL_ID)
                 .setVisibility(Notification.VISIBILITY_PUBLIC)