Merge "Add a separate namespace for CaptivePortalLogin module." am: c9b6889e04

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873954

Change-Id: I333eb00c1c424e1e679f463f1f8d96507da3184f