Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 5970060ac5 -s ours

am skip reason: Merged-In If550b000a40608832d42dac4f3010db87e3800bc with SHA-1 3dec16bf85 is already in history

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

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