Merge "[TOFU] Force connection to a newly approved network" into tm-mainline-prod am: 333b2da3d7

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

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