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: I7ba928ce30fcb292c9ad1c704ae20c5c66ee6453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>