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

[automerger skipped] Merge "Drop PendingIntent extras from external packages during enrollment." into tm-qpr-dev am: fb10927f -s ours am: bceb47eb -s ours am: 76b38107 -s ours

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

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



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