[automerger skipped] Merge "Security fixes for PendingIntent related apis in...

[automerger skipped] Merge "Security fixes for PendingIntent related apis in LauncherApps" into sc-dev am: 7d43598f -s ours am: 0dd33156 -s ours

am skip reason: Merged-In Id262b9a0de58d8834c85d925cf84bb44b8b99742 with SHA-1 e41e04bb is already in history

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

Change-Id: Icdf0ed6179e58698a3a1e3bc790f392be921141e