Allow two service address to be registered. am: b02b772954 am: f666bb14b5

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3138174

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