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

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

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