Merge "Update design to fix non-protected broadcast from system issue" am: 548e90b6f7

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

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