diff --git a/Android.bp b/Android.bp
index 5250dc5895c8..485e8e3ea974 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1570,3 +1570,14 @@ filegroup {
     ],
 }
 
+// Avoid including Parcelable classes as we don't want to have two copies of
+// Parcelable cross the process.
+filegroup {
+    name: "framework-cellbroadcast-shared-srcs",
+    srcs: [
+        "core/java/android/util/LocalLog.java",
+        "core/java/android/util/Slog.java",
+        "core/java/com/android/internal/util/State.java",
+        "core/java/com/android/internal/util/StateMachine.java",
+    ],
+}
\ No newline at end of file