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

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

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