Merge "Reduce the time to show passpoint entry in Settings" into udc-mainline-prod am: eeb8152a79

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

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