Merge changes from topic "Intent spam" into main am: 925747a773

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

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