Merge "Migrate ICaptivePortal to stable AIDL"