Merge "Fix abnormal wake up caused by WifiConnectivityManager" am: d0d583b43d am: 65893e8696

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1540867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12b9ad4b6d6c76f65823277b52e9af0c2c193605