Merge "Add package to intent" into sc-v2-dev am: a6e9c4a9ea

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16405538

Change-Id: I223aa5d01eb57058b956c9b195d017bd073de3c1

services/people/java/com/android/server/people/data/ConversationStatusExpirationBroadcastReceiver.java

@@ -31,6 +31,7 @@ import android.os.CancellationSignal;
 
 import com.android.server.LocalServices;
 import com.android.server.people.PeopleServiceInternal;
+import com.android.server.pm.PackageManagerService;
 
 /**
  * If a {@link ConversationStatus} is added to the system with an expiration time, remove that
@@ -50,6 +51,7 @@ public class ConversationStatusExpirationBroadcastReceiver extends BroadcastRece
             final PendingIntent pi = PendingIntent.getBroadcast(context,
                     REQUEST_CODE,
                     new Intent(ACTION)
+                            .setPackage(PackageManagerService.PLATFORM_PACKAGE_NAME)
                             .setData(new Uri.Builder().scheme(SCHEME)
                                     .appendPath(getKey(userId, pkg, conversationId, status))
                                     .build())