[automerger skipped] Drop PendingIntent extras from external packages during...

[automerger skipped] Drop PendingIntent extras from external packages during enrollment. am: d2ca5b76 -s ours am: b55dbae2 -s ours am: 486666ce -s ours am: c4de3c2a -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: I907755e90bcd92bab5953c5a6d90a527e07e42a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>