Merge "Add a separate namespace for CaptivePortalLogin module." am: c9b6889e04 am: 6c6b1f1c4b am: 8089e2a48a am: a086351846

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

Change-Id: Id20b9fa3b0a7eb4dae431f82abad5d54926da7f0