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

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

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