Merge "CaptivePortal: implement setDelegateUid API." into main