[automerger skipped] Merge "Prepare CaptivePortalLogin for system_current" am: 74b1c8626e am: 9b29d62990
am: b07e914d33 -s ours
am skip reason: change_id Ic6ce98942959705ea7ef14a7a62d33e3abf7eb72 with SHA1 8551d39830 is in history

Change-Id: I19c49a941830ebaba5bf21639d08566231d03251