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

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



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