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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec906e8d0b20dcbb3b6d82a5829aa82af82a0b90