Merge "Reduce BROADCAST_TIMEOUT_MS." am: 74d7554c55

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

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