Merge "Compile CaptivePortalLogin as system_current"
am: a5a7af11d7

Change-Id: Ib2675171c491228bf01105919a1167b7996cb2e7