Merge "Combine two register broadcast receiver methods into one method" am: 40eb6abb07 am: b352594f85

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

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