Merge "CaptivePortal: implement setDelegateUid API." into main am: 69aa3c5469

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3381151

Change-Id: Ib50c70897fc5239bb2182d2b3cb69651cb100d02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>