[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 57f2cbdb23 -s ours am: c0e223d8bd -s ours

am skip reason: Merged-In I1f613d0a26fac0bca3326409d2bf52294c88f680 with SHA-1 769cac6d8d is already in history

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

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