[automerger skipped] Merge Android U (ab/10368041) am: bf2b70c442 -s ours am: 5d554d08f5 -s ours am: 204405b681 -s ours

am skip reason: Merged-In I7d72ca5a68c52b05adf34ca27239036c58ce1e79 with SHA-1 9f9f1806c5 is already in history

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

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