Merge "wifi: Extend netlink message timout value" into tm-dev am: 0ad7df1117 am: 0f372caf77

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/17984182

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