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

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

Change-Id: I80c1383899308101dd8d80644e08b357f924c248