[automerger skipped] Merge "Drop PendingIntent extras from external packages...

[automerger skipped] Merge "Drop PendingIntent extras from external packages during enrollment." into tm-dev am: 8b6eb6f8 am: 1bcce22a -s ours am: 4eb96e35 -s ours

am skip reason: Merged-In I61281dcf95e53100a96d6a218f3f00fd1b4ea3f9 with SHA-1 d2ca5b76 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/33186486



Change-Id: If2733a54eb5f505ef266d9d46e96a54c4be347ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>