DO NOT MERGE - Merge ab/7272582 am: 28ab6e2a00

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

Change-Id: I5bea9b2e1ba10aab617c84de31f56cf90c093ba8