Merge "Reduce BROADCAST_TIMEOUT_MS." am: 74d7554c55 am: 4c1032a0b8 am: 4c8bd5ba99

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

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