[automerger skipped] Merge "Drop PendingIntent extras from external packages during enrollment." into udc-dev am: 3dc13506 am: afc328d3 -s ours am: cc905879 -s ours

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

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



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