Merge "Migrate reigster service callback backend" am: ee0e6cd701 am: 044b5fc9eb

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

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