[automerger skipped] Merge "Security fixes for PendingIntent related apis in LauncherApps" into sc-dev am: 7d43598fdf -s ours am: 0dd3315653 -s ours am: 77fcabe052 -s ours am: 2cd3a29568 -s ours
am skip reason: Merged-In Id262b9a0de58d8834c85d925cf84bb44b8b99742 with SHA-1 e41e04bb8c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16778744
Change-Id: I499bcc686499fd158d68696fa1e6cad8c9ff7db5
This commit is contained in: