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

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

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