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

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

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