Merge "Reduce BROADCAST_TIMEOUT_MS." am: 74d7554c55

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

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