Merge "Reduce BROADCAST_TIMEOUT_MS." am: 74d7554c55 am: 5608cf353d

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

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