Merge "Do not crash test on invalid pending intent" into main am: f1a7b4122a am: 73907351f7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3127454

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