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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47d07a8cafefb06e0e45c515a133c863c63d1e6f