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

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



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