Merge Android 14 am: ecbbdfbba3

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

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