[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5454f8f63c am: da7537f331 -s ours

am skip reason: Change-Id I157d9f2815c15f0abd5e6f5396816dfc22873980 with SHA-1 c82bf076e9 is in history

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

Change-Id: I3c09340b93e57143af54550ad9ec89f795e26b78