Merge "De-duplicate questions with multiple listeners" into main am: d4b80206 am: 8d04d02b

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



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